Merge "RCFilters UI: Anchor the highlight popup"